destinator: rename 'destinator_trk' into 'destinator_trl'.

diff --git a/destinator.c b/destinator.c
index 6561c47449b574b8c6fe702b35ed95fe06563cb5..59b3c323b2445f0371409e5b3554316a8cda09cf 100644 (file)
--- a/destinator.c
+++ b/destinator.c
@@ -549,7 +549,7 @@ ff_vecs_t destinator_poi_vecs = {
        CET_CHARSET_UTF8, 1                     /* fixed */
 };
 
-ff_vecs_t destinator_rte_vecs = {
+ff_vecs_t destinator_itn_vecs = {
        ff_type_file,
        { 
                ff_cap_none                     /* waypoints */, 
@@ -567,7 +567,7 @@ ff_vecs_t destinator_rte_vecs = {
        CET_CHARSET_UTF8, 1                     /* fixed */
 };
 
-ff_vecs_t destinator_trk_vecs = {
+ff_vecs_t destinator_trl_vecs = {
        ff_type_file,
        { 
                ff_cap_none                     /* waypoints */, 

diff --git a/reference/track/destinator_trk.dat b/reference/track/destinator_trk.dat
deleted file mode 100644 (file)
index 6d54aff..0000000
Binary files a/reference/track/destinator_trk.dat and /dev/null differ

diff --git a/reference/track/destinator_trk.txt b/reference/track/destinator_trk.txt
deleted file mode 100644 (file)
index 39b0717..0000000
--- a/reference/track/destinator_trk.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-No,Latitude,Longitude,Altitude,FIX,Satellites,Date,Time\r
-1,53.556728,9.865573,47.5,"3d",6,2007/08/17,09:31:56.496\r
-2,53.556728,9.865575,47.8,"3d",6,2007/08/17,09:31:56.752\r
-3,53.556728,9.865577,47.9,"3d",6,2007/08/17,09:31:57\r
-4,53.556728,9.865577,48.0,"3d",6,2007/08/17,09:31:57.248\r
-5,53.556728,9.865577,48.1,"3d",6,2007/08/17,09:31:57.504\r
-6,53.556728,9.865578,48.2,"3d",6,2007/08/17,09:31:57.752\r
-7,53.556728,9.865577,48.3,"3d",6,2007/08/17,09:31:58.248\r
-8,53.556728,9.865578,48.4,"3d",6,2007/08/17,09:31:58\r
-9,53.556728,9.865578,48.4,"3d",6,2007/08/17,09:31:58.752\r
-10,53.556728,9.865580,48.5,"3d",6,2007/08/17,09:31:59\r
-11,53.556728,9.865578,49.6,"3d",6,2007/08/17,09:32:00.496\r
-12,53.556728,9.865578,49.6,"3d",6,2007/08/17,09:31:59.248\r
-13,53.556728,9.865580,49.0,"3d",6,2007/08/17,09:31:59.504\r
-14,53.556728,9.865578,49.5,"3d",6,2007/08/17,09:32:00\r
-15,53.556728,9.865580,49.6,"3d",6,2007/08/17,09:32:00.248\r
-16,53.556728,9.865575,50.1,"3d",6,2007/08/17,09:32:01\r
-17,53.556728,9.865578,49.5,"3d",6,2007/08/17,09:32:01.248\r
-18,53.556728,9.865577,49.5,"3d",6,2007/08/17,09:32:01.504\r
-19,53.556730,9.865577,49.6,"3d",6,2007/08/17,09:32:01.752\r
-20,53.556728,9.865575,49.7,"3d",6,2007/08/17,09:32:02\r
-21,53.556728,9.865575,49.8,"3d",6,2007/08/17,09:32:02.496\r
-22,53.556728,9.865575,50.1,"3d",6,2007/08/17,09:32:02.752\r
-23,53.556728,9.865577,50.0,"3d",6,2007/08/17,09:32:03\r
-24,53.556728,9.865577,49.9,"3d",6,2007/08/17,09:32:03.248\r
-25,53.556728,9.865577,49.9,"3d",6,2007/08/17,09:32:03.504\r
-26,53.556728,9.865575,49.9,"3d",6,2007/08/17,09:32:05.752\r

diff --git a/testo b/testo
index 5212800d63c35e8a1c35297c338c599eb75464c3..76903aae98683902577b2bf322f775c441d62601 100755 (executable)
--- a/testo
+++ b/testo
@@ -1319,9 +1319,9 @@ ${PNAME} -i destinator_itn -f ${TMPDIR}/destinator_itn.dat -r -o unicsv,utc=0 -F
 compare ${TMPDIR}/destinator_itn.txt ${REFERENCE}/route/destinator_itn.txt
 
 # Destinator TrackLog
-${PNAME} -i nmea -f ${REFERENCE}/track/nmea+ms.txt -o destinator_trk -F ${TMPDIR}/destinator_trk.dat
-${PNAME} -i destinator_trk -f ${TMPDIR}/destinator_trk.dat -t -o unicsv,utc=0 -F ${TMPDIR}/destinator_trk.txt
-compare ${TMPDIR}/destinator_trk.txt ${REFERENCE}/track/destinator_trk.txt
+${PNAME} -i nmea -f ${REFERENCE}/track/nmea+ms.txt -o destinator_trl -F ${TMPDIR}/destinator_trl.dat
+${PNAME} -i destinator_trl -f ${TMPDIR}/destinator_trl.dat -t -o unicsv,utc=0 -F ${TMPDIR}/destinator_trl.txt
+compare ${TMPDIR}/destinator_trl.txt ${REFERENCE}/track/destinator_trl.txt
 
 
 exit 0

diff --git a/vecs.c b/vecs.c
index 506ae0ae881624320aa1b383e614a541846f2df2..544e5cf7280d7f7450aecca0ccbada98ea2e2219 100644 (file)
--- a/vecs.c
+++ b/vecs.c
@@ -133,8 +133,8 @@ extern ff_vecs_t navilink_vecs;
 extern ff_vecs_t ik3d_vecs;
 extern ff_vecs_t osm_vecs;
 extern ff_vecs_t destinator_poi_vecs;
-extern ff_vecs_t destinator_trk_vecs;
-extern ff_vecs_t destinator_rte_vecs;
+extern ff_vecs_t destinator_trl_vecs;
+extern ff_vecs_t destinator_itn_vecs;
 
 static
 vecs_t vec_list[] = {
@@ -749,14 +749,14 @@ vecs_t vec_list[] = {
                 "dat"
         },
         {
-                &destinator_rte_vecs,
+                &destinator_itn_vecs,
                 "destinator_itn",
                 "Destinator Itineraries (.dat)",
                 "dat"
         },
         {
-                &destinator_trk_vecs,
-                "destinator_trk",
+                &destinator_trl_vecs,
+                "destinator_trl",
                 "Destinator TrackLogs (.dat)",
                 "dat"
         },

diff --git a/xmldoc/formats/destinator_itn.xml b/xmldoc/formats/destinator_itn.xml
index 8b137891791fe96927ad78e64b0aad7bded08bdc..f39ff240a8cd2fc43a2f7efb656222783e9072d1 100644 (file)
--- a/xmldoc/formats/destinator_itn.xml
+++ b/xmldoc/formats/destinator_itn.xml
@@ -1 +1,18 @@
-
+<para>
+  Support for <productname>Destinator</productname> itinerary files.
+</para>
+<para>
+  These have (mostly) extension .dat and are binary files. The file structure is undocumented
+  and so this format was reverse engineered from some .dat files.
+  At this time we can read and write name, comment and the coordinates of the route points.
+</para>
+<para>
+  <productname>Destinator</productname> by
+  <ulink url="http://www.destinatortechnologies.net">Destinator Technologies</ulink>
+  is a software for PNDs, Smartphones and PDAs.
+</para>
+<para>
+  <userinput>
+      gpsbabel -i destinator_itn -f from_A_to_B.dat -o gpx -F from_A_to_B.gpx
+  </userinput>
+</para>

diff --git a/xmldoc/formats/destinator_poi.xml b/xmldoc/formats/destinator_poi.xml
index 8b137891791fe96927ad78e64b0aad7bded08bdc..a6ee5976fa0b65cbf88efc56d38c25979b12db9d 100644 (file)
--- a/xmldoc/formats/destinator_poi.xml
+++ b/xmldoc/formats/destinator_poi.xml
@@ -1 +1,19 @@
-
+<para>
+  Support for <productname>Destinator</productname> binary POI files (.dat).
+</para>
+<para>
+  The basic information was found at <ulink url="http://mozoft.com/d3log.html">mozoft.com</ulink>.
+  We can read and write all fields described at this document. Please note that 'house number' isn't
+  supported as a separate field. This field, if available in source, will be stored together with 'street'
+  into our internal 'address' field.
+</para>
+<para>
+  <productname>Destinator</productname> by
+  <ulink url="http://www.destinatortechnologies.net">Destinator Technologies</ulink>
+  is a software for PNDs, Smartphones and PDAs.
+</para>
+<para>
+  <userinput>
+      gpsbabel -i destinator_poi -f interesting_places.dat -o gpx -F interesting_places.gpx
+  </userinput>
+</para>

diff --git a/xmldoc/formats/destinator_trk.xml b/xmldoc/formats/destinator_trk.xml
deleted file mode 100644 (file)
index 8b13789..0000000
--- a/xmldoc/formats/destinator_trk.xml
+++ /dev/null
@@ -1 +0,0 @@
-

diff --git a/xmldoc/formats/destinator_trl.xml b/xmldoc/formats/destinator_trl.xml
new file mode 100644 (file)
index 0000000..05ff162
--- /dev/null
+++ b/xmldoc/formats/destinator_trl.xml
@@ -0,0 +1,18 @@
+<para>
+  Support for <productname>Destinator</productname> binary tracklogs (.dat).
+</para>
+<para>
+  The basic information was found at <ulink url="http://mozoft.com/d3log.html">mozoft.com</ulink>.
+  In addition to the standard GPS track data (coordinates and timestamp) this format stores also
+  position fix and the number of satelites seen during recording. 
+</para>
+<para>
+  <productname>Destinator</productname> by
+  <ulink url="http://www.destinatortechnologies.net">Destinator Technologies</ulink>
+  is a software for PNDs, Smartphones and PDAs.
+</para>
+<para>
+  <userinput>
+    gpsbabel -i destinator_trk -f last_trip.dat -o gpx -F last_trip.gpx
+  </userinput>
+</para>